From 48e51d118403c4dd5fc84ce36f2839362a1e6d3a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=82=96=E7=9B=9B=E6=96=87?= Date: Sat, 23 May 2020 14:26:21 +0800 Subject: [PATCH] update changelog for 1.1.1-1,add Merge branch info --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8c020f..3164ea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ opencc (1.1.1-1) unstable; urgency=medium * New upstream version 1.1.1 * change libopencc data pkgname from libopencc[num]-data to libopencc-data * change libopencc pkgname from libopencc2 to libopencc1.1 - * update debian/libopencc1.1.install + * update debian/libopencc1.1.install for filename *.ocd2 * add debian/libopencc1.1.symbols * d/rules: - delete override_dh_missing: @@ -21,8 +21,9 @@ opencc (1.1.1-1) unstable; urgency=medium * delete unused patch: use-system-libraries.patch * d/watch: use @PACKAGE@ @ANY_VERSION@@ARCHIVE_EXT@ * d/clean: add obj-x86_64-linux-gnu/ + * Merge branch 'master' come from - -- xiao sheng wen Sat, 23 May 2020 12:49:02 +0800 + -- xiao sheng wen Sat, 23 May 2020 14:21:50 +0800 opencc (1.1.1-1~exp1) unstable; urgency=medium -- 2.30.2